Merge from origin/emacs-25

4b347fe Clarify that doc fixes are okay in feature freeze
01669ad Avoid crashes when setting the cursor
f2144ee Restore 'command-debug-status' functionality
ec6e4b9 ; Minor addition to CONTRIBUTE

diff --cc CONTRIBUTE
Simple merge

diff --cc doc/lispref/debugging.texi
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/xdisp.c
Simple merge